GtkIconHelper: use FORCE_SCALE when force_scale_pixbuf is set

When force_scale_pixbuf is set, the icon helper will scale the
icon to the requested size (either the pixel size, or the resolved
icon size), so we can just as well instruct the icon theme code
to do the scaling for us.

diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index c8977e3aef5be0135a849a6227c9e26c435a34da..d2d170681f5e87b32d3c95f6332e302f71c206ce 100644 (file)
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -264,7 +264,7 @@ get_icon_lookup_flags (GtkIconHelper *self, GtkStyleContext *context)
 
   if (self->priv->use_fallback)
     flags |= GTK_ICON_LOOKUP_GENERIC_FALLBACK;
-  if (self->priv->pixel_size != -1)
+  if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf)
     flags |= GTK_ICON_LOOKUP_FORCE_SIZE;
 
   flags |= _gtk_style_context_get_icon_lookup_flags (context);